From: Carl Lerche <me@carllerche.com>
Date: Thu, 20 Mar 2014 17:57:39 +0000 (-0700)
Subject: Move test build into target
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1129^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=c31dc13ac5c0e58ec3d7b3597fa5383cdccde164;p=cargo.git

Move test build into target
---

diff --git a/Makefile b/Makefile
index ddbf0d1f8..7a2100fd8 100644
--- a/Makefile
+++ b/Makefile
@@ -48,17 +48,16 @@ $(BIN_TARGETS): target/%: src/bin/%.rs $(HAMMER) $(TOML) $(LIBCARGO)
 TEST_SRC = $(wildcard tests/*.rs)
 TEST_DEPS = $(DEPS) -L libs/hamcrest-rust/target
 
-tests/tests: $(BIN_TARGETS) $(HAMCREST) $(TEST_SRC)
-	$(RUSTC) --test --crate-type=lib $(TEST_DEPS) -Ltarget --out-dir tests tests/tests.rs
+target/tests: $(BIN_TARGETS) $(HAMCREST) $(TEST_SRC)
+	$(RUSTC) --test --crate-type=lib $(TEST_DEPS) -Ltarget --out-dir target tests/tests.rs
 
-test-integration: tests/tests
-	CARGO_BIN_PATH=$(PWD)/target/ tests/tests
+test-integration: target/tests
+	CARGO_BIN_PATH=$(PWD)/target/ $<
 
 test: test-integration
 
 clean:
 	rm -rf target
-	rm -f tests/tests
 
 distclean: clean
 	cd libs/hamcrest-rust && make clean